CFY-836 code cleanup