Cleaning up SDK