Removed unfinished DB code