SPT cleanup