slowly removing the util class...