Removed references to submodules