Cleanup of PyCharm remarks