More code cleaning
Merge pull request #5 from kezz101/experimental

Removes Apache IO and cleans more code