Changes:
 * Removed benchmark class from CPU implementation, to match simpler GPU scheme.