added trans tags to stuff and removed obsolete code
Merge pull request #901 from dimagi/code_cleanup

added trans tags to stuff and removed obsolete code