Remove product teardown to troubleshoot problem