removed Java 7 stuff (now it's 1.6 compatible)