Remove calls and traces of Superuser

Change-Id: I4ede5691df3bcc7c5d0c9f980d3b1011605ab5f5