Remove unnecessary constraints