Removed deprecated methods
Removed broken code
This commit will be reverted when I have time to work on it
Java 1.6