Clean up of group handlig, cleaning verilog generation