Remove some unneeded stuff