prod mode
cleanups