Cleaning up routing and statistics (WIP).