Removed now-superfluous checks
Adjusted references to submodules