Cleaned up collection creation on client