Remove unused code
Change log tag
Use Log.d() for debug messages
Merge branch 'remove_sample_functionality'