JZ: Some refactoring and fixes for #622
Merge pull request #623 from onaio/622_by_the_book_delete_responses_for_datatags

JZ: Some refactoring, closes #622