Some cleanup code...