Removed references to the user, since they're obselete now