Clean deprecated and var