2.0: a bit of clean-up