Removed `Draw` trait
Merge pull request #759 from bvssvni/newdesign

Removed `Draw` trait