Clean up pylint

Related to #16526