Removed two classes which do not work with JRE8