cleanup types, api version