remove unnecessary code, prepare to update model with results