Completed clean-up of config class