Comment out buggy code