CIVI-23 --removed cruft