Remove debug code
Implemented minimal submodules support