Can we take out this commented code, or you want to keep it around?