removing references to invalidate