clean-up (see previous commit)