Remove DB; refactor logging