Optimized router.

Removed the "raw" method as it serves no real purpose.