BZ-9746 - fixing my cleanup