Fixed solution

removed the database partial implementation and the unfinished usage of
it.