Removed ConfigUtil since it was a hack