Remove invalidate calls when not required