Move deletion into Control and Connection