add IgnoreREst and cleanup unused