Re add iw comment removal
Should Fixes #66
Also removed large section of commented unused code