fix typo
remove old unused junk