Clean up GWT wrapping