cleanup configuration handling