Remove redundant invalidateSelf() calls