Cleaning up size negotiation