Remainders: Deal is made, mayoral control fight fades