Removed old class. REOL-18