remove unused property and update to new style