Tidy up, remove some not needed references to configfmod