Minor refactor/simplification
Merge pull request #4182 from dimagi/new-static-refactor

Minor refactor/simplification