more junk clean-up