removed some unecessary stuff