Remove unused submodules
Add lock for preventing concurrent tasks loading