Another place where we should check for cleanup