yet another clean-up