[jmdb] Tidy up