Property handling cleanup