Remove usage of Makara.connection

This allows for a multi-connection environment to live happily ever after.