CFY-999 more cleanups