Cleanup harvester a bit
Pulled down update to submodule_dir