Minor fixes and delete old config files