update to new version of model
removal of files and pull in upstream