Remove classes that are now in the edsutil library