Fix - Remove bits that snuck in during grails upgrade