Clean deprecated values++