cleanup to simplify gwt merge