Edited todos again
Deleted some of the files for screens that will be concatenated.
Deleted some of the files for screens that will be concatenated.