Removed some not needed stuff, now compile in Java 1.6