Remove comments
Run header links through Router