Removed the hard-coded generated userId