Remove extraneous dirs