0: additional clean-up