Delete unused part of code. Fix conflicts with it.
Merge branch 'master' of https://github.com/yurii-shylov/mimolet.git