remove over-engineered import
clean up some comments
Merge pull request #1262 from dimagi/random-cleanup

Random cleanup