Code cleanup : removing Log.d and unused codes