Remove popularity column
Remove unused scopes