Cleanup
Support for gwt 2.7