Java 7 Cleanup