Remove unneeded dependencies
Store and lookup from UUID