Utilities clean up