removing extra stuff replaced with groovy script