cleanup and trying to move to pyside