Fixed remove notification issue