Config changes and cleanup.