Removed more junk. Added support for custom routing.