Removed unnecessary code

and added new Class