CFY-1829 cleanups