Cleanup + updated rpidb user side database management