cleaned up some unused libs and references.  got rid of "prototype" and used pre-defined string.
Merge remote-tracking branch 'origin/master'
more spring-ifying