Commented out code should go away. Same for the line below.