Fix regexp
Remove old scope package