1) if shard is primary on 'local' remove it's entry in config.databases
2) better error message listing databases that need to be moved manually

This will probably also need some doc work here http://www.mongodb.org/display/DOCS/removeshard+command