Python3 cleanup