Updated code to remove old yammer references