Trying to get groovy to ant-build
Random cleanups