Got rid of my ill-advised model method