Removing unused util classes