Removed some uncessisary things