Fix various: 20141216

Unnecessary duplication of lines 83, 84