routes cleanup & combined to one file