Remove some unneccessary things