Small category cleanup