Remove erroneous stuff from helper package
Inline helper code
Remove helper file & further isolate linux code