remove blocking database calls