Cleaning up the non-Cython version for mode=Octagon