Cleaned up submodules