trivial cleaning-up