big cleanup and back to cython