minor dead code removed