more cleanup in categories