GDM cleanup