Merge bench, clean files, pointers for shells