Tidy up route import