Clean up more stuff, update DH-ACC