Comment out the newly added unless statements