remove dependency on DB