Manually-merged project update

Deleted redundant files.