remove unecessary stuff