Tidying up references to SDK