More unused but set cleanup