Clean up for production