removed old class
Added original code copyright notice