Remove a rather insecure cipher
Fix JDK 6 compatibility