Removed saving userid