remove core modules from build
Build is nearly converted