remove hacks for groovy