move config cleanup to initializer