m: Refactoring Route while testing
Route cleanup while testing