Removing Java7 stuff, fixes #7