Cleanup of SVDO commit

Change-Id: Iacb3eb157c4d6fe2f994d3b0e4f69e12c6b92fe1