Merge "Remove scripts that haven't yet been updated for python3."