Clean up and resolve some TODOs
Merge branch 'master' of github.com:otvorenesudy/otvorenesudy