reclaim a couple more functions after tests

Created by  Kartik K. Agaram  on August 19, 2022
UVSNG336IICLLK3O6YX5HE6IBRDZJCM2N22XCEU3L6R25N6QTMXQC
Change contents