Remove this, we do conversion in storm