More unused but set variable cleanup