Remove renormalized values in favor of model properties
Update factories and views