cleaning up router and routes