Removed legacy user helper code