removed crap model
Fixed merge