removed some long dead code