e610: clean-up