Cleanup Configuration class to follow configuration flow