Multimodule cleanup

some cleanup after the multimodule refactoring