fix typo, remove some cruft