Clean up kernel conflicted defines