Revert "more junk"

This reverts commit 6f6792bbb05fea169a8ffd57749139d54a261df7.