removed submodules
simplified