Remove old database implementation