Remove database dependancies (for now).