removed re-use of property maps