Clean up collection creation for self-deposit contributions
closes #179