clean up utilities and set in separate branch