Trim keeping column and badge names

This should get rid of more duplicates.