Removed submodules and merged