Remove route object from handler registration. Closes #1941, Closes #2020, Closes #2021