Constraint cleanup and only support vertical orientation