Config class clean up