remove 'do', cleanup regex