removing unecessary stuff