Cleanup Regexp codes