Cleaning up router