* code clean up - remove redundant code and add comments
* save onDestroy
* remove junit test that was never used