Remove unnecessary property sets