Remove master token and update message