Removed a few CyanogenMod-like things