remove silly optimization for neighborhood collectives
move a bunch of stuff around