Getting rid of old Groovy parser