remove obsolete 'shape2'