minor fix + dead code