removing some unecessary stuff