Commenting a few things out