Remove some unnecesary stuff