More mouse cleanup