Revert "clean up"

Reverts ZJU-ISST/isst-android#24