clean up before enhancement upgrades