removed unnecessary checks in Config