remove cm specifics/fix kernel building