Tuning and cleanup.