S000: Clean up changes

Change-Id: I19170a3325952cda238513ed2a657413875cc3bf