#532 removed old files which got accidentally kept during rebase conflict resolving