Fix dalvik-cache
Remove CM stuff