Remove a few more hardcoded category specific things#606

haoranpb wants to merge 5 commits intomainmicrosoft/BC-Bench:mainfrom

fix/more-ready-for-categoriesmicrosoft/BC-Bench:fix/more-ready-for-categoriesCopy head branch name to clipboard