7z2john.py removal of some broken code