further directory cleanup