Switched to md5-dict for metadata and removed some leftovers