Can we remove this commented out code? It's OK to throw `NotImplementedException` if something isn't ready. Code that is commented out is hard to deal with, because in a month you won't remember why you commented it out.