Remove unneccessary stuff