Removed code that required Java8