Removing generation of plain model from the master branch