removing unnecessary files after rebase from upstream