Data directory and cleanup