CLC-4366 Remove some unused junk