more property cleanup