More system update cleanup

Change-Id: I2e2507c6a290a0e0b82499e8ada4f6c88681ec7d