Yet more using cleanup