Removed old interface and trait
Merge branch 'release/2.0.0'