Removed parts of code made useless by last commit, added comments
Merge branch 'chinese' of https://github.com/chili-epfl/qimchi into chinese