Cleanup CM stuff and add dalvik fix