Remove some dead code
Remove some dead code

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

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