More tweaks to icnbc verilog
Remove all versions of output from S3