Remove references to old libraries
Update project files for JDK7 IntelliJ 12