Cleanup code before release