lots of cleanup of the new cell processor (see #28)