Remove some references to get_current_username() and current_user_info