remove waitforimages
remove xregexp