remove some dead code
remove some dead code

hughperkins/pub-prototyping,hughperkins/pub-prototyping,hughperkins/pub-prototyping,hughperkins/pub-prototyping,hughperkins/pub-prototyping,hughperkins/pub-prototyping,hughperkins/pub-prototyping