Removes code not changed from refactor