Clean up CategoryHelper