added encoding
removed unused groovy
added profile for 1.7 compiler version
some cleanup
cleanup