nobug: remove dead code. r=jhopkins