S000: cleanup

Change-Id: I984fe4623039f4a39d08f95acaf439d6819f8d26