remove some unecessary stuff