Clean up kernel make merge