Remove unneeded submodule init
Consolidate submodule functions and combine commands