Untested cleanup and add utils