Cleaning up conflicting configuration settings