Removed obsolete routes, moved vars