Removed vagrant support and some cleanup