Remove unused code
We're running with Java 7
Change loading/unloading of features