Can we get ride of this commented out section?