Removed message handlers from global scope