#22 - router comments removed