lazy-require some of the modules
remove moot comments