Removed excessive super user use