Some cleanup for production.