Removed junk and cleaned up routes