Cleaning up constraints so that everyone is happy