fix typo, remove old code