more dead code rip-off