Remove unecessary stuff