clean up s2 and s4

Change-Id: Ifbc4ff21a0abbd31d67332850faeca562d06e898