Cleanup some utilities