[#497] GWT code cleanup