Commenting and remove old code