Remove old handlers from the map if they are replaced
Remove debugging
Add more examples