subtests...top: Simplify cleanup method

Signed-off-by: Chris Evich <cevich@redhat.com>