Remove no longer used properties