lots of cleanup in utilities