Clean up for new python version