more cleanup
Merge branch 'master' of https://github.com/avneev/vera
some more cleanup
some more cleanup