Fixed so that we can remove connections