fixed usage of criteria with scopes,
removed outdated TODO comments