Cleaned up CategoryStore