Remove legacy stuff
Use current_user to retrieve guest OR registered user (no need to use current_or_guest_user anymore)