clean up vagrant, simplify