Removed a couple of things that caused an error on java 1.6