Remove Controller class and simplify mapRoute changes
Remove change in doc