Removed old request handlers
Changed listeners to subscribers
Changed listener to subscriber 2