Some tweaks to get stuff working
* Fix database name (redundant space at the end)
* Fix the CH database in English (still pointing to the wrong db)
* Remove the legacy Wiegels database

Change-Id: I388ea0cef39cd7826e78bccef38a58fa6fc488bb