Commenting more code out