Some Commenting and Deleting of files unneeded