Getting rid of CategoryOption