remove debug code
Util module, clean up warnings
hlint