SC03E:CleanUp

Change-Id: I30c0659a5c5347884fa06737bd03942495992a84