cleanup configuration, and add extension configuration