Remove CM stuff and fix dalvik