'Updating to use superuser instead of SU
and some clean up'