Remove unused imports
Move one static inner trait to top-level class
Merge pull request #1 from glaforge/trait-experiment-phase2

Removed unused imports and moved one trait to top level