Remove old unecessary stuff