cleanup/polish models
mv prop