cleanup - use util class