GWT Separation: removed references to GWT that are not necessary now