removing all this unecessary stuff