Merge pull request #1119 from kwilczynski/master

Change wording.
Remove unneeded code. Didn't work.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>