Removed some code again