utility class cleanup