Same here (I assumed that since you've removed "Events" methods from Storage you'll do the same for impl )