Clean up data directory, and code too