UI EventHandler removal for redundant code