Refactor the return value from index module. Just return object with route handlers on it directly
remove dead code