Removed unnecessary cyanogenmod and aosp remote definitions