Refactoring efforts
Removing old common submodule