Delete unused files, add automatic choice