Removed some templates from old GWT code