A little more property clean up