deleting some dirs that came back from merge