Clean up Avogadro more or less.