third and last batch of using cleanup