More directory cleanup.