Refactor files, delete comments and one file.