[PB] {other} Added email address in drawer and deleted old code