rm files that somehow ended up cluttering my tree
merge import