More token cleanup, remove unused insert cruft, no effect
Cleanup all routes warnings

Mainly these were caused by $s in comments because apparently comments
turn into documentation somewhere.