update constraints
cleanup