Cleaning up SPs