-Some cleanup