Cleanup deal itself using connection trait for connection instance handling
and creation