GWT Wrapper cleanup