Removed some unneccessary stuff.