remove deprecated values..