remove use of external database