Started Commenting and Removing Unused Code