Remove submodule references
Modifications for Linux environment