Cleanup code for production release