Cleanup; removed custom routing stuff.