Updated for cIniFile cleanup