added check for removal of properties