Clean up the SU

Change-Id: I802d533df945bd1114935664f5165c31bb3518d1