Remove unused vars & fix typo

Nothing major, just some cleanup.