removed gdao specific stuff