Cleanup some unneeded stuff