Minor cleanup for unused variables
Creating vendor subdir for submodules