I think we can get rid of all the commented code in this file.