Clean up

Removed redundant configuration items in router.inc and prepared for
demo site template