Clean up these, change default api version