Removed remaining notification dependencies