Remove extra folders