Merge "Delete old VTS code"