More post-route cleanup

Signed-off-by: Charles Steinkuehler <charles@steinkuehler.net>
Cleanup mostly complete, ready for final check plots

Signed-off-by: Charles Steinkuehler <charles@steinkuehler.net>
Resync with master
Resync