Just get rid of the commented out lines of code. They are confusing (and that is why we use git).