remove donate stuff and fix ordering