removed traits
Merge branch 'remove-traits'