some merge derps and remove some unwanted stuffs