removed some unused util classes