Removing unnecessary code
Implemented default case for routers (closes #7)