extract functions to utils
remove unnecessary properties map code
Merge pull request #2056 from dimagi/refactor1

misc refactors