1037 Delete some dead code