Moved back to java 1.7 (for now)
Removed unused section.