remove cloudmade support; fix api