This notification should be moved into a trait, which would let you remove these checks.