Remove cruft, combine databases