Remove some unneccessary stuff