cleanup for the latest SDK