Removed a lot of unneccesary code from the  C++ section. Also removed
some stuff from the Android part as well that I had used at one point
for debugging (and some stuff that I felt was not helping the UI as much
as I had thought originally)