Cleaning up connection class