Update to remove unnecessary category dictionary