Remove dead code and refactoring

Andrey Veltischev requested to merge andrey/refactoring into master

Fixes #22 (closed)

Merge request reports