code clean-up

removed unused code from android implementation