Upgrade to Grails 2.4.0 and some little clean-ups