This deletion seems unrelated to notification features - is this the right branch for it?