PIM-1489 : Clean up category controller