Cleanup some more