Clean DB manager code