engine-related clean-up