Squash warning/not lie about the mapping being optional.
Delete a couple of old (unused) files.
Merge pull request #4 from adam-vessey/7.x

Squash warning/not lie about the mapping being optional.