Clean up faulty merge in 42fcf6d.

This deletes a few files that were previously deleted in develop, in 243fa33.