remove Java 8 code, clean up some mess
todo items and minor tweaks