Removed more unnecessary @user variables.