Removed some java8 features I probably accidentally used