[Layout]: removed old listener
[UrlMapper]: Fixed an issue in upgrade related to event lister