Comment-out image methods for now, the appear to be creating a problem with JDK6

 - Changed some other collection declarations to be JDK6 compatible
 - Preparing build for production deployment