Yeah, I'd say remove it if it is optional, one less thing to update on each release.