Remove unfinished and unmaintained Variant code (Cont.)