Cleanup
Fix submodule mixup