partial wizard cleanup