remove  and  from controller and selector