Remove dependency on gdata