Revert pylint fixes; disable pylint warnings in code -- examine later