Add underscore, cleanup core modules