Improve cleanup
Remove unused files