Clean up the properties mess.