CFY-1308 clean commented code