Some more cleanups

idea is taken here - https://github.com/daeiron/android_kernel_sony_apq8064/commit/13644837ad06ab35fdb31c94c6913e5958d53b5f