Removing unecessary stuff