Remove old util classes