Removed Classes and files now not needed