Fix output
Remove unused files