Remove database calls