Remove invalidator mess