To be consistent with the rest of the lib, I'd keep those. Can eventually be removed later in a different PR