Remove NSNotificationCenter dependency