Remove more stuff, fix ganglia.