code cleanup and ignoring grovvy test which needs to be rewritten in Jav...

...a