Should this have a @depricated annotation?