There is a lot of code that is commented out in this pull request. If it is not going to be used, remove it. If it is going to be used, explain it somewhere.