Fixed removetools