More GUI event related cleanup