Updated source for GWT remove