Removing wrong files
Merge branch 'hotfix/oldfiles'