Category cleanup