Remove unused files, and created new files