Fixes #29
Removed deprecated *Holders and replaced them with new grails.util.Holders
Removed surplus resource
Merge branch 'remove-deprecated'