more no more dynamic finders

Change-Id: Ibd26ab5b324efff3b9b1af52ac225198f440d8a7
Reviewed-on: https://gerrit.instructure.com/43599
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>