Extracted routes + cleanup