Cleanup for SAF start sequence