Cleanup and API version update