first changes for Java8
removed obsolete methods
Java8'ified the code base