Cleanup some things