Various cleanup of utilities