Merge pull request #1117 from kwilczynski/master

Try to clean up old content.
Change name of the directory to remove.

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