(RarchDB) Cleanups