util cleanups