Added directory cleanup