PEP 8, remove commented code [MJ-350]