CLC-3682 Remove unused controllers