Cleaned up, & removed obsolete routes & files