Cleanup for production use