Fix doc, remove superfluous code