Changes recommended by Arne
Remove unused files
Remove more unused stuff