cleanup, getting down to the core modules