Removed some things #2