Added db schema + removed dead code