Remove some unneeded metadata
Remove more unneeded client metadata
Refactor metadata