Removing some commented code as well as some unused code.
Work on stop result saving from android.