Removing useless classes, continuing GWT compatability.