Clean up inifile stuff from #362