Remove Old auth approach and add new approach