get rid of old ‘expand’ and uncomment extract & dot stuff