Removed code but Added new class which does some of the work that I had
before.