updated to remove properties