Removed some unncecessary stuff