Updated to go1.1 and removed superfluous code.