SDK clean-up