Some dead code removed