some tidy up on emailroute