More directory cleanup