CFY-912 removed some unnecessary configuration