Remove legacy code on controller utils (#453)