Clean up nbnxn cluster pair addition code