Got rid of submodule