Py utils cleanup