Use routes for message ids. Issue: #370
Removed unused code. Issue: #370