Clean up faulty merge in 42fcf6d.

This deletes a few files because they were previously deleted in develop, in 243fa33, but the merge restored them from master.