More controller and routing cleanup