Cleanup routes and removed old & unused test data