Minor: remove commented code
For #1340: fix schema key