Mock DB, version cleanup