REmoving some submodules, other cleanup