Minor cleanup for prod.