fix gwt compile + cleanups