misc changes and fixes
setup vagrant env
removed dead code