More SDK cleanup