City ends 2007 golf management agreement but wants new one