Remove DB implementation + fixes