cleanup pre DMC version