Clean up directory creation and usage.