Commenting + Deleting Obsolete Code