Move property files collection clean-up

Moved the cleaning up of files selected for each property to the
SerializeForPersistence() method