remove unused trait and class