Cleaning up ModelPropertyProvider