all round cleanup of mageia-2 templates