removed creation of Tail objects all over the place