Can we eliminate the old variant code and merge this in to the main avdl file?