Cleanup from Pylink