Cleanup unnecessary trait enum