cleaning up references to data directory