Clean up collections and serializers