Refactored notification removal, fixed dismiss upwards.