Deleted commented code, fixed unit tests for new combined constraints