Category and repo cleanup