Removed unnecessary line that made a test fail
Merge