Clean up unused vars and tasks, fix vagrant