remove motion model, move model logic to model
dry error_message