refactor(database): removed unnecessary/redundant code