Clean up evolution stuff