Clean up route.php
Merge origin/master