Removed scopes since they were causing issues