extension method cleanup