S999: moar cleanup

Change-Id: I92f5435eadb8030d1f5f892a72604fe10f4912ab