More cleanup to configuration