Some dead code pruned