Removing unsafe plotting