[#497] GWT code cleanup

@iperdomo please review