Improve RemoveButtonListener from RemoveFrame