Clean up and fix Vagrant for testing
Cleanup and simplifying code