Remove vmware support and general tidy up