Could we remove the code instead of comment out? As I said, you could keep local change or develop unit test later.