Merge https://github.com/ramorrismorris/umb-vms
cleanup