I think its not necessary to have this commented out code, right?