Removed constraints code