Also remove testing less stuff