Removed some code