some code cleanup. UnNeeded submodules are removed.