Got rid of GConf and some more porting and out-commenting