Removed Classes and files now notneeded