remove liminality calcs, optimize neighbor calcs