Cleanup some simple ones.