We do not need this class anymore. REOL-28