Remove unused config values for code tidy-up