Remove merged parts, disable broken fwb keyboad workaround