Clean deprecated values