removing all this unecessary shit