Clean up files
Merge branch 'old'