clean up manual record not found exceptions, dryify some scopes