Removed duplicate defaultIniFile
Removal of left over safeName declarations