Remove the map CLI options, which haven't been working properly for ages anyway.  This is related to Issue #41