Clean up notices
Routes: Adjusted for array support