clean up some utility stuff