Clean up some unneeded stuff