Old code cleanup. Sorry
Merge
Merge pull request #36 from ssvsergeyev/develop

Develop