Fixed routes, cleanup