@xiangli-cmu I think we should just delete the code instead of commenting out. Do you want me to work on merging this PR right now or do you want to do it?