Remove more dead code
Remove more dead code

Signed-off-by: Max Brunsfeld <8ee73e75b50cc292b5052b11f2ca25336d3e974e@pivotallabs.com>

cf-routing/cli,TomG713/cli,ReachingOut/cli,markstgodard/cli,cgvarela/cli,TomG713/cli,mcowger/cli,diatmpravin/cli,saurabhguptasg/cli,nttlabs/cli,SrinivasChilveri/cli,xingzhou/cli,markstgodard/cli,simonleung8/cli,18F/cli,AmitRoushan/cli,mcintyred/cli,ReachingOut/cli,xingzhou/cli,nimbus-cloud/cli,saravana76/cli,HuaweiTech/cli,cf-routing/cli,zhang-hua/cli,hyenaspots/cli,18F/cli,rastasheep/trash-can,HuaweiTech/cli,markstgodard/cli,fujitsu-cf/cli,pishro-cc/cli,SrinivasChilveri/cli,kavoj/cli,pishro-cc/cli,ofer43211/cli,kavoj/cli,simonleung8/cli,rastasheep/trash-can,EngineerBetter/cli,srikanth88infy/cli,diatmpravin/cli,fujitsu-cf/cli,zhang-hua/cli,mcintyred/cli,zhang-hua/cli,HuaweiTech/cli,Zouuup/cli,evanfarrar/cli,mcowger/cli,nimbus-cloud/cli,saravana76/cli,evanfarrar/cli,nttlabs/cli,ReachingOut/cli,kavoj/cli,nttlabs/cli,mcowger/cli,AmitRoushan/cli,SrinivasChilveri/cli,AmitRoushan/cli,srikanth88infy/cli,saravana76/cli,TomG713/cli,srikanth88infy/cli,Zouuup/cli,cgvarela/cli,srikanth88infy/cli,ofer43211/cli,saurabhguptasg/cli,evanfarrar/cli,diatmpravin/cli,carnell69/cli,18F/cli,evanfarrar/cli,Zouuup/cli,fujitsu-cf/cli,HuaweiTech/cli,nttlabs/cli,xingzhou/cli,rastasheep/trash-can,pishro-cc/cli,kavoj/cli,xingzhou/cli,carnell69/cli,carnell69/cli,saurabhguptasg/cli,ReachingOut/cli,cf-routing/cli,diatmpravin/cli,hyenaspots/cli,nimbus-cloud/cli,mcintyred/cli,cgvarela/cli,hyenaspots/cli,cf-routing/cli,ofer43211/cli,SrinivasChilveri/cli,cgvarela/cli,EngineerBetter/cli,markstgodard/cli,Zouuup/cli,ofer43211/cli,hyenaspots/cli,18F/cli,rastasheep/trash-can,AmitRoushan/cli,simonleung8/cli,carnell69/cli,zhang-hua/cli,TomG713/cli,saravana76/cli,EngineerBetter/cli,saurabhguptasg/cli,pishro-cc/cli,mcintyred/cli,mcowger/cli,EngineerBetter/cli