Logical testsupport cleaning