Doing some cleanup.
Merge branch 'master' of https://github.com/bigboss424/CandUnix