some minor cleanup

fixing gradle wrapper usage
removing unused file
removing unnecessary comments

Change-Id: I516d5bf32956ddf5c5e59d2bcd359fde7ad4e3f8