Mindor cleanup