ListController code cleanup