Removed submodules, will be added back in lib/