Kill dead code & fix typo