CFY-1000 removed some unnecessary code, some doc changes