Changing so connections are cleaned up

This ensure that the connections are cleaned up faster