Clean up collection spec
Clean up client spec