Remove data inspects and add some other