cleanup mock models
 resolved merge conflict