router cleanup
more work