Delete two files, edit main file for clarity