Fix last of pylint messages, delete dead code