Is this class still needed?