First sweep at removing VMS support.