ANDROID: Remove commented code