cleaned dead code