DW: Removed the openrosa response stuff and code clean up