finished merging Paul's changes to Journal; removing old content files